From: Ewan Mellor <ewan@xensource.com>
Date: Wed, 8 Nov 2006 09:50:09 +0000 (+0000)
Subject: This patch addresses bugzilla #649, enabling `xm list' to display the
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15567^2~63
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=ac311155285dbe1035976a12fb4b2910b697a1ef;p=xen.git

This patch addresses bugzilla #649, enabling `xm list' to display the
actual amount of memory allocated by a guest.  Also this patch:
  -  makes it more apparent that 'xm mem-set' has no effect on HVM's.
  -  show's that memory is changing if 'xm list' is issued while guest is
ballooning (w/o touching balloon driver)

Signed-off-by: Tommie McAfee <tommie.mcafee@unisys.com>
---

diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py
index 2a3d2d30b3..fa0eb0f65d 100644
--- a/tools/python/xen/xend/XendDomainInfo.py
+++ b/tools/python/xen/xend/XendDomainInfo.py
@@ -1042,6 +1042,10 @@ class XendDomainInfo:
         except:
             log.exception('Failed to restart domain %s.', str(self.domid))
 
+    def getSysMem(self):
+        info = dom_get(self.domid)
+        xs_memory=int(info['mem_kb'])/1024
+        return xs_memory
 
     def _preserveForRestart(self):
         """Preserve a domain that has been shut down, by giving it a new UUID,
diff --git a/tools/python/xen/xend/server/XMLRPCServer.py b/tools/python/xen/xend/server/XMLRPCServer.py
index 4ab43ca7f9..eb662c4fab 100644
--- a/tools/python/xen/xend/server/XMLRPCServer.py
+++ b/tools/python/xen/xend/server/XMLRPCServer.py
@@ -79,7 +79,7 @@ methods = ['device_create', 'device_configure',
            'destroyDevice','getDeviceSxprs',
            'setMemoryTarget', 'setName', 'setVCpuCount', 'shutdown',
            'send_sysrq', 'getVCPUInfo', 'waitForDevices',
-           'getRestartCount']
+           'getRestartCount', 'getSysMem']
 
 exclude = ['domain_create', 'domain_restore']
 
diff --git a/tools/python/xen/xm/main.py b/tools/python/xen/xm/main.py
index 2a3778c7c8..48fa4229ed 100644
--- a/tools/python/xen/xm/main.py
+++ b/tools/python/xen/xm/main.py
@@ -563,6 +563,12 @@ def parse_sedf_info(info):
         }
 
 def xm_brief_list(doms):
+    def get_mem_info():
+       dom_sysMem=server.xend.domain.getSysMem(d['domid'])
+       if dom_sysMem:
+               d['mem']=dom_sysMem
+
+
     print '%-40s %3s %5s %5s %10s %9s' % \
           ('Name', 'ID', 'Mem', 'VCPUs', 'State', 'Time(s)')
     
@@ -571,6 +577,7 @@ def xm_brief_list(doms):
     
     for dom in doms:
         d = parse_doms_info(dom)
+        get_mem_info()
         print format % d
 
 def xm_label_list(doms):